Fixes #4903: Consistent cancellation error messages for thinking vs streaming phases #4904
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…treaming phases - Modified Task.ts to check if cancellation was user-initiated (this.abort = true) - When user cancels during thinking phase, now shows 'API Request Cancelled' instead of 'API Streaming Failed' - Ensures consistent UX for user-initiated cancellations regardless of when they occur
dosubot
bot
added
size:S
Contributor
|
Generated with ❤️ by ellipsis.dev |
hannesrudolph
added
the
Issue/PR - Triage
Collaborator
hannesrudolph
left a comment
hannesrudolph
left a comment
There was a problem hiding this comment.
Thanks for your contribution. I've left a couple of comments on the PR:
- An unnecessary log file seems to have been included in the commit.
- A question about test coverage for the cancellation logic change.
Please take a look when you have a moment.
| ? undefined | ||
| : (error.message ?? JSON.stringify(serializeError(error), null, 2)) | ||
|
|
||
| await abortStream(cancelReason, streamingFailedMessage) |
Collaborator
There was a problem hiding this comment.
This change seems to correctly handle the inconsistent cancellation message. I'm curious if there are any existing tests that cover this scenario, or if we could add a new one to ensure this behavior is protected against regressions?
hannesrudolph
added
PR - Needs Preliminary Review
and removed
Issue/PR - Triage
Member
|
This fix seems to solve the issue:
|
daniel-lxs
moved this from PR [Needs Prelim Review]
to PR [Needs Review]
in Roo Code Roadmap
mrubens
approved these changes
Jun 30, 2025
github-project-automation
bot
moved this from PR [Needs Review]
to Done
in Roo Code Roadmap
hannesrudolph
pushed a commit
that referenced
this pull request
Jul 3, 2025
…treaming phases (#4904) Co-authored-by: Daniel <[email protected]>
utarn
pushed a commit
to modelharbor/ModelHarbor-Agent
that referenced
this pull request
Jul 4, 2025
…nking vs streaming phases (RooCodeInc#4904) Co-authored-by: Daniel <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR fixes the inconsistent cancellation error messages reported in issue #4903. Previously, when users cancelled during the thinking phase of reasoning models (like Claude 4.0 Sonnet), they would see a misleading red 'API Streaming Failed' error instead of the expected grey 'API Request Cancelled' message.
Changes Made
Testing
Related Issues
Fixes #4903
Related to #4039
Type of Change